Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 7 Dec 2013 17:21:57 +0000 (19:21 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 7 Dec 2013 17:21:57 +0000 (19:21 +0200)
commit95c6a7e9de110d3b5c10ac0b442b7805f9543b61
treef8c33b11f7907977c0538cb6c8aa1e6adc0e7185
parent2bdcf051d425d64f76568819432827f853a9edc5
parentfd01cc0938033387715f65321b48531c59272218
Merge from trunk.
etc/NEWS
nt/inc/ms-w32.h
src/emacs.c
src/fileio.c
src/gnutls.c
src/image.c
src/w32fns.c
src/w32proc.c
src/w32term.c